ticket:5 fix some remarks