Improved use of arguments