Minor memory efficiency improvement