removed redundant generated code and chaned formatting of models