Refactor method and field look ups