Tidied P21 slightly