Regex Update

Second time's the charm. Now gobbles up any whitespace left in for formatting, doesn't capture unnecessary groups and doesn't break anything.