Refactor of JGEX Java Geometry Expert