Lint driven cleanup