Refactored code for breaking out arguments and returns from defs