a little cleaning up - object fully implemented