Cleaner function defs, and allow result for Delete