-Indentation of the Header File

-Reorder in the cpp file to match the order with Header File