rubocop run including some manuall cleanup