Integrate the newest rubocop suggestions