Cleanup 2

Rubocop + Style fixes.