Tidy source files
Clean up README.md