Ben: more cleanup in the main class