Updates after code review