Just tidied up core a bit.