Satify RuboCop
Satify RuboCop, again
Some more clean up