Minor refactoring returns while del and trav ast