Make some code style fixes, courtesy Rubocop