Refactoring and unit test implementation.