Handled feedback from Jeremy Audet.