Comments changes and delete string create updated to adapt to the common "Where" structure