Minor refactor of demo server