Code Review Fix