hgn: semantic tabbing

Putting back the tabs where it makes sense to group things.