fix #4 Forgot to re-introduce whitespace removal after refactoring