Improve logs + formatting