Resolve whitespace-related linting issues
Merge pull request #57 from ryanathasoffers/misc_cleanup_3

Resolve whitespace-related linting issues