static code review changes