massive refactoring, removed cake pattern cruft
Cleanup & Comments