Integrate review comments and remove some vars