polish ClientFlag layout