#652 - attempt to address review comments