Corrected the formatting style
Coding style correction
Merged conflicts from coding style