final comment and clean up