cleaned up models/viewmodels