Tidied up some POD. Arguably for #34 (as was 4fd964104fadaaa16766df6b57451cc88002f0f5)