Lint and Nit and various other cleanup