Cleanup
Improved console output