Starting to organize and clean up