Add clean targets.
Minor refactoring.