clean up ch 1 & 2 to be more idiomatic