First attempt to update code in response to code review