Fixed issues found by golint.