added some godoc comments
more friendly formatting