General code clean up for setUpClass method