A bit of code readability and a preg match fix
Merge pull request #1 from BluABK/yanderefix

A bit of code readability and a preg match fix