Cleaned up the Server Framework