cleanup 8

1. modify some comments
2. change message
3. make `data` a class