improved rubocop compliance (incomplete