Tidying up shim