Clean up and work on linear inertia