Cleanup and Readme update