Code review comments and one more try revert
Code review comments and one more try