More logger tidying