Small linting and whitespace fixes

2 jobs for master in 34 seconds (queued for 3 seconds)