Reordered pin definitions to be more logical