Minor refacoring