One less REGEX