minor code enhancements