Fix coding styles and some minor issues.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>