Cleanup JoinCommandHandler some more