replace naive loops, fixed enormous code

replace naive loops, fixed enormous code #94