Code cleanup
Re-enabled print-smart download