Fix model names and indenting