Thanks @AndreiH - great idea on how to make it neater & shorter.