comment and clean up