cleanup (format and remove non actual comments) after commit b06672a