Minro comments changes