CLEANUP: Add golint style comments in most places.
CLEANUP: Fix various golint issues.
CLEANUP: Fix non-go-style variable names in test.