Formatting changes in hgd main