Cleanup, move the demo data into server.js (solves concurrency when deployed) and logging