A bit of code readability and a preg match fix

YAY!!!