Cleaned up models file