cleanup and changes to inital repo