Refactor. No intentional functionality change.