Moved a few returnvals around

Makes more sense in my head