Tidied it up a wee bittie