Minor cleanup; make design less complicated