fixes suggested by golint