Lint and a bit of cleanup.