Small refactoring before 1.2.5