Small sleanup
Fix Rubocop
Fix rspec