cleanup based on rubocop warnings