[Refactoring Code]