Refactor some more.