Not just *some* refactorings. THIS IS SPARTA!