Add coding magic comments to offending files
Fix rubocop whitespace errors