Code ready for improvement
Code ready for enhancement; issues #1 and #3 complete