cleanup and comments in whiskering