Code review comments and one more try revert