Cleanup
Update README