Improve comment block