Simplified whitespace management #28

Close #28