Simply Better Code

Renamed, rewritten and overall improvements.