builder style
preparing for tests
cleanup