Reorder instance variables

Consistency with L91-92. It just bugged me.