Cleaned up Main Server class