The Great refactoring is upon us
The refactoring continues
couple tunes and tweaks