Refactored & renamed some stuff
Refactored & renamed some stuff