some clean-up and organizing;