Minor clean up details.