Fixed: code review and modify.