A little more dynamic and a bit more cleanup.