[CodeReveiw] Updated Code Review