Renamed and moved vars for clarity.
Converted all pre-existing code :D

That took a while.