Cleaned up the coordinates and made them more clearly defined using levi-civita operator.