A bit of clean up and synchronization
More clean up