minor org cleanup