Cleanup and Readme construction