ws removal
Merge pull request #241 from JonRowe/whitespace-tidy

Whitespace Removal