Cleanup, use better techniques