tidy up geometry

Assignee Loading
Time tracking Loading