Cleaning up core file a bit.