WIP godoc friendly comments