added formatting for parts of the model

and added structure to the formatter