Cleanup, made analysis use our formatted path for logs