modification following golint