Improve logging? Less verbose maybe?