MDL-41276 / MDL-41279 editpdf: code cleaning