Reorder and clean up Core AuthMethod