Style fixes to balance ut badding shift.