Clean-up and more reasonable write size

Communication is much slower than I expected: 0.6MB/s

--CAR