Try to make some of the code more readable

[JJ-Atkinson]

I broke out a bunch of functions and put them on the bottom of the file. If anything broke, this is why :) There is still a big piece of code around here that is in-named.

[RikerW]

Thanks a lot for working on this BTW!!!