Fixed some incorrect Cartesian types
Code cleanup
Fixed how clone was being used