Formatting updates, cleaned up, but no real changes from opsec.