Self Code Review Changes

Self Code Review Changes