Clean up Todo model

Made a little relaxing refactoring and testing