A few more enhancements as suggested via code review