Tidied up logs/println