fix fillDescription error and reduce duplicated code