Did some random code changes so the code can be audited.