golint related fixes