Refactoring. (0.1-D6)