Fixed #1
go fmt fixes