Minor change to setup order for aesthetics.