Fixing more rubocop errors