Comment fix and cosmetic changes