Refactoring class design of all.