Capstone-ready
Clean up for presentation