Adjustments after @jeremy's feedback:

* Better regex, appears only once.
* Method names adjustments.