Changes for golint.
Changes for golint.