echo to print
More code cleanup
Fixed a typo
Fixed an another typo