Code Review

ComponentModel class cleans up gridmodel class. see pull request page
for more details