Domain model change

Fixed up some formatting