Reordered some class variables