more changes formatting