Minor changes to the main class