various cleanup during personal review.