improving comment integration