Add some keys, cleanup format a bit