Cleaned up client/server benchmark
Code shrinking
Updated benchmark results.