Small refactoring in the creation