Minor clean up and comment add.