Minor comments and doc cleanups. Rearrange util.