Some updations to code and formatting

Signed-off-by: Vasishta Shastry <vipin.indiasmg@gmail.com>