cleanup, structuring