cleaned up models and such