ticket:3 fix some remarks