Refactoring done !