Fixed some golint problems.