Clean up figure
Next Version