Cleaning some codes add docblocks