Code refactoring completed for root(dump) decoder