add some comments, cleaning a bit