additional golint issues resolved