More rubocop fixery, only 21 errors to go!