Finished fixing rubocop errors