tidy up key support