More whitespace cleanup and MPLv2 licensing support.