cleaned up the server a bit