Some Reformating done. made IIcon array of flag final and Client only