Address most Rubocop complaints