More refacoring