Agreed, it does read better on separate lines, fixed a couple more in ModelExtensions and the content serializer.