Code Refactoring 1.0