Minor formatting modifications in readiness for adding socket.io