Since the style guide agrees with you, let's just get rubocop in here & fix these all in one go.