Cleaned up server.h and server.cpp, a bit easier on the eyes.