Agreed, I've tidied it up