More on clean-up and refactorization