started cleaning up and organizing