Fixing rubocop and foodcritic issues