fixed some minor cosmetics issue