minor refacoring