Clean up and fix README