Another god class falls to the might hand of the refactor.