Cleaned up Server class