Tweaks after reviewing