Remove empty lines and unused local variables
Merge pull request #224 from dockyard/doug-minor-cleanup

Remove empty lines and unused local variables