Fix regex syntax & clean up extra notes