minor ch 13 cleanups