#42 clean-up whitespace