- Refactor on Demo project.