Rubocop compliant

Plus some fixes.