Finalising refactorization