Nice print lines :-)
Minor class cleanup