#186 - Updates from review