Minor changes to containsAll() and source format