fix name
tidy logging