Some Code review updates