Minor memory optimization