Finish golint for file.
Golint changes.
Golint
golint.
golint.
Fix up for golint.
Fix up tests so that all tests are valid and passing.