Cleanup for Securosis style.