(GL) Refactors pt. 2