Code cleanup; Publisher flow improvements