remove loop helper method, fix missing EPSILON