Make code more consistent.