Some clean up in the main program class.