Fix style issues using rubocop --auto-correct
Fix more styling issues