rearrange variables in header file