Feature/move to method

The use of `eval` is a serious security risk.<br>Avoid the use of Perl-style backrefs.