Tweaks to the refactor