Import cleanup, lots of whitespace fixing and reformatting, a couple of variables renamed
Import cleanup, lots of whitespace fixing and reformatting, a couple of variables renamed

rst2pdf/rst2pdf,rst2pdf/rst2pdf