do some clean, do some comments