Refactoring work.