Just some clean-up to prep for width fix.