Clean up and keyword fix.
Upgrade to fix keywords.