Initial lint/vet cleanup

Most of this probably should not be exporter. Revisit that later.