PHYS-16 #time 20m #comment Minor cleanup.