Improve logging consistency