Simply Better Code Pt. 2

Renamed, rewritten and overall improvements.