A little cleanup and renaming
Cleaned up imports
Now binding works again with the named comets