few minor code changes