general minor code improvement