Fixed rubocop & foodcritic suggestions