add todo
Modify some code with webstorm.