Cleaned up models source