Refactoring.
Done.