A little comments added