+ more structural refactor