[General] Cleanup and refactoring of some shit.
[General] Missed some stuff in the prev. commit.