Renamed constant instances of Unsafe based factories
Fixed access problem for cleaner method