Clean up Arguments somewhat