More cleaning due to the refactoring