Tidying up the adapters