Add comments and cosmetic change