Refactoring. When will this be done?