Fix some identation and reorder some patches