code simplified
Merge branch 'arguments-clean'