Modify some code. No functionality modification