A bunch of refactoring.
A bunch of refactoring.