Improve geometry