A few improvements - couldn't resist playing some more. :-)