better B/C check and inline comment