Almost tidied up