trying cleaned datamodel code
whitespace