Tidied up privacy and terms