Refactor worker, join manager after message