Minor refacoring.