Updating to reflect code review feedback