Code read comments.  Remove unused code, wrap BOP tokens.