Working 3D fluids in world space. Some cleanup