Refactoring of method building
* Old method builder has been removed, replaced by new one
* Next refactoring is still needed