Correct some Rubocop things that I agree with