comments and clean up message