Updated all geom stuff to follow new coding style guidelines