Cleanup and tests

* rubocop
* clean rake