intiail clean up and restructure