Fix none and improve comments