Go ahead with refactoring.

Gotta make a tool that will generate documentation for that crap.