commentd, cleand, reorganised