improvement and beautifulize Object