Refactor, slightly.