more comments  & cleaning