Key configuration, tidying