minor cleanup, more comments