Refactors

* Removed unnecessary variables and did some renaming
* Everything still passes