Regex now actually deals with whitespace