Corrections due to gofmt,golint,govet