Some adjustments according to the reviews comments