go: cleanup
go: cleanup + comments