comments, clean up