Headers and indentations improved

Headers are improved!

Indentations are being taken care of!

Regards
~Vikash