Slightly improve mechanism for creating the todos