Paul's tidy ups for gytis