comments and cosmetic changes