Better comment layout