PDIO-152 #comment update comments and clean up