More conforming to the requirements of rubocop