Concurrrent server Code Cleanup