Codewriter Refactoring