Tidy up

All remaining features should work well (matches numbers in “Optical
properties of Solids” Mark Fox