Rubocop and clean up work.