More cleanup, changed -m to -r since it's a regexp