Final refactoring before starting on CE2 requirements