tidied slightly