Rubocop perfection

Mainly for @supernullset to take a look at.