Refactor method so that it is in a more obvious class