Comments and structure improvements