Cleaned up and made the console output more useful