Removed some functional style techniques of handling state of objects.