Fix some rubocop offences
More rubocop offense
Almost done with the rubocop offenses