A bit of cleanup, all is well !!