dev: better comment model