Remove dead code, minor formatting tweak.