#81 Improve log