simplify some portions of general regex
simplify some portions of general regex

[#125681231]

Signed-off-by: Kris Hicks <6d3f751023bc04266d4da2ff94804f4240839fe2@pivotal.io>

pivotal-cf/cred-alert,pivotal-cf/cred-alert