Improved code and presentation
Improved code and presentation