Cleaning up

Removed a good 40 lines and opted for print %
Added some output