Add 'clean'
Minor cleanup and re-indent.