Minor chagnes for beautification