Update code to conform to golint standards.