Minor formatting and refactor.