little clean up, still can't tackle the server-client sync issue