Revert extraneous changes and style fixes