Re-factoring continues...