some tweaks to cleanup - thanks jugglinmike