Some slight code clarity