More refactoring - Adrien