rubocop and cleanup