Moved more functionality into object methods.