more cppylint fixes