renaming of models and indention fix