I continue with the refactoring