Got rid of annoying ds_comment