Refactor parts of method list