[FOLD] Tidy up logging