FIX for some rubocop style issues