more cleaning up, organazing better structure