model updated, view cleaned