cleaned up models
cleaned up models