Couch cleanup

read commit by commit (first is just formatting, second is substantive)