Both tidied up, thanks