refactor Slocator