Refactor method list