Refactoring. Getting better in the demo.