Tidying up, use logging properties