More whitespace improvements. Fixes #24