Clean up code on calling the class