making setup and teardown more clear