cleaned up Object more