Server - More comments and cleanup