Assorted Cleanup

* Reorganized a method
* Tightened up variable incrementing
* Changed object declaration
* Changed String types
Fixed code formatting issue