Clean up and intro rewrite