tested with rubocop, offenses fixed