Fixed ordering in main class