updated model and cleaning