tidy up
Better info on logging

Thanks to rapzo and SobanVuex for pointing this out