Change order method definitions to match declaration order