Tidied up the changes a bit more in preparation for patching