Lint and cleanup