More refactoring. The God Function is pretty much disolved, and the code is very much better off for that.