Added classes to clean up the update and render functions
Fixed merge conflict