added changes per golint