Fixing a number of golint issues.