getting my ass whipped by go lint, a lot of cleanup