Code tidied up...