Cleaned up SWP eqn