cleanup and reformatting for wander