Minor design cleanup