Clean up Todo model

Had a little relaxing refactoring and testing