First Code Refactoring