some comments and clean up