Code cleanup
Code cleanup, better way to print console output