Improved one regex and fixed change suggestion in comment