Minor code cleanup

Julian Stirlingrequested to merge
minor-code-clean into master

This MR will

  • Remove trailing whitespace
  • Remove unused imports
  • Reduce overly complex statments
Edited by Julian Stirling

Merge request reports