refactoring unpacker