Cleaned up the Model Class.
Merge branch 'refs/heads/modelCleanupBranch'