Refactor encoding list