Formatting and godoc fixes