fix white space, refactor #2