Removing inline postfix increments
Restructuring top values

This restructure logically orders values, clearly showing the lifecycle
of variables
Consolidating variable definitions and initializations
Flip "total" over to be logically consistant when building
Merge pull request #1 from blast-hardcheese/master

Minor refactors