Code Refactorised