Some cleanup with renaming and removing extraneous call to CompareAndSwap