Better comment structure