start cleaning up for godoc
start cleaning up for godoc