Cleaned up model and added comments
 updated