Tweaks to simplify table