Improved the way methods return the object