00.20.50.140804

* Cleaned up lots of variable and method names
* Code and comment cleanup and optimization