Clean up
This is the basic idea