Rubocop finesse

Improves style and adds more cops.