Comment section improved