Tried different printing.
Minor updates and code cleanup.