Improve linting

Made some progress on the golint front. Still not where I want it but at least the recursive linting works again.