I didn't get a chance to run this today but I will dig in tomorrow and see if we can improve this, make it a bit neater.