slight tweaks to reduce bloat