Cleaned up demo code for better legibility and less confusion
(hopefully)