Use explicit retry; style cleanup