Cleaning up args