some organizational cleanup