slight ordering and style changes