Minor adjustment on regex, and updating comments