code cleanup for !orglist