Minor tweaks from review
Final changes from review