Moved stuff that was automatically moved from reformatting