Refactor again.