lint and tweaks