Yet more cleanup
Added diagram