-comment and cosmetic changes