cleanup && improvisations