Some clean up to header

Change-Id: Ib36ccca19c124a3d0b3dc96a23574d022e2ba5c9