Cleanup and updated readme