Address @deniak's comments