A lot of fixes for Rubocop