Small clean up and comment add.
Clean up