US44-Refactoring Code