:lipstick: Refactoring ThreadSafeExecutor