Code cleanup, formatting adjustments
Cleanup to demo code, better build