Code cleanup and golint.