More cleaning up, commenting out redundant printing statements and making the output more readable