Minor changes with main class