More style fixes for rubocop.