The refacoring continues...