Some code polish
First step towards Cairo based printout