Argument cleaning