Clean up formatting.  Fix multimedia keys.