Improve comment and logging text