Fix in value and remove comments