Refactor 81.