Moved sphere to Triangles and cleaned up