Clean up demo
Fix variable addressing