[Demo] - Code Refactor