Fixed more rubocop errors