Refactoring and new markup for the PostgreSQL license