Code Refactoring 1.1