Fix regex bug; new formatting