Code Refactor.