Going through code to make the project report. Refactored some more names