minor code changes