Comments and minor cleanup.