Improve comment mechanism