Polishing-up the refactoring process.  Almost done...