Code includes refactor.