Improve comment parse