Thanks for these pointers, will look into improving it!