Followed advise from gofmt, govet and golint