Rearranged properties in header file