rubocop cleaned up