minor cleanup, ch2