removed unnecessary teardown, added more comments