Applied code review changes