* Took normalizing function calls out of loops (speed increase)
* General file cleaning (pep8 compliance, etc)