Format out some redundant code in API handling
Fix up scavenge
Merge with master