tidied up again