Code Design Refactoring