variable renames (golint)
golint: docs++, deadcode--