Lots of lint cleanup, not perfect yet
Lotsa lotsa changes, linter is happier