Switched to MPL 2; formatting fixes.