Add geometry classes to clear up kmeans
Style fixes