Code cleaning
Some more console output