Regarding Privacy Policies, I was sent an email by a co....interestingly it has "before" (aka now) and "after" (gdpr).
aybe have a look and see if you can get inspiration from it;
BEFORE (in force now): https://www.fasthosts.co.uk/terms/privacy-policy
AFTER (in force from 05/25): https://www.fasthosts.co.uk/terms/privacy-notice
To my mind the gdpr version is a lot more clear, and is all common sense. Looks good I think.