Improved regex

A leaner and faster regex. No need for a callback.