rubocop lib
spec clean up
more spec clean up