Reverted code style changes to make this PR cleaner