Mr clean

Cleaning up some issues with Rubocop.