separate models to one
cleaning up