some minor code update