Fixed several offenses according to Rubocop