License consistency, few spacing fixes.