Enhancement and cleanup