Some general cleanup
Even more cleanup, plus options print