Clean up some bits of code which were flagged by the linter