Clean up, fix license headers