Cleanup model formatting