Very minor tweaks, rev'd just to be safe