Revert unrelated code style changes