Some Rubocop inspired cleanup.