Fix in case style
Better comments