Reduced memory consumption
Small tweaks