Improve logger