little more cleanup and a small style tweak