Format code and update README