Tear down class implementaion as well as a few formating changes nothing
major just some minor fixes and the teardown