Static code review changes