Final version of review
Tweaks and clean up