Last refactoring before submission