Cleaned up models, added comments