Style cleanup in response to Rubocop comments