Updates based off of code review - in progress