Editing xhandleshape

Cleaning and commenting