removed some code to make it a little more flexible/easier to maintain view state
cleaning up changes
cleaning up