Modify some comments
use filter