Cleanup and Read me update