some more cleaning and organizing