Cleanup, mostly I removed the coding standard ignore instructions.