Refactor decoder input stream