Improve comment types