Last refactoring before contribution