Method extraction refactor