Minor sch. clean-up