add `comentadapter` &clean up code
bug fix & clean up code