Pull into field, read for future injection
Reduce visibility of methods, preparing to factor out object
Removed unused methods
Push static methods into object