Fixed code review changes 3