a bit of adjustments on style