Whitespace and unused imports/vars
Fixes #120
Merge pull request #155 from aodn/Issue_#120

Issue #120