Cleaned up ServerController