Minor simplifications
Compact code for retrieving arguments