Updates based on code review and a sit down with Fowler