Refactoring - dissolving the God class.
Tiny refactorings.
More refactoring -> more encapsulation.