Feature/move to method

Avoid the use of Perl-style backrefs.