Enh : Clean cod and add comment