Fix existing linting problems

Ryan Hargrequested to merge
housekeeping/fix-linting-problems into develop

No functional changes, mainly reformatting and import changes

Merge request reports