Use consistent style for while block