cleanup

and some comments on the top.