Style Cleanup and Logic Cleanup

This pull request is my changes so far.  Let me know if you have any questions on any of this.