some minor code guideline enhancements