Updated Geometry

Changed default values to None from -1, added comments, added spacing