Just a bit of cleanup for the server source and header files.