Fixed comment style and name change