Formatting changes to the header template and related code.

Signed-off-by: Harish Patel <harish.patel@vitruviantech.com>