Update after code review