small changes, removed experimental functions for govet & golint