lint, cleanup