Refactored code - cleaned up post demo