Lots of clean up. Making source tutorial friendly.