Editing xhandleShape

Cleaning up